update gperf usage for C++. (#172)

this resolves clang 6.0.0 warnings:
warning: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register]
in_word_set(register const char* str, register unsigned int len);

diff --git a/Makefile.in b/Makefile.in
index 1edc25e7ebb7b1dc4a07300ce4f9be2fb565b998..ec6d095a30e6a410b603487e03824e59cfef0765 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,7 +164,7 @@ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
        CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 xcsv_tokens.gperf: xcsv_tokens.in
-       gperf --output-file=$@ -L ANSI-C -D -t $?
+       gperf --output-file=$@ -L C++ -D -t $?
 
 config.status: configure
        $(SHELL) config.status --recheck

diff --git a/csv_util.cc b/csv_util.cc
index 2f42e50125a5804ede91889cad9e39904a5a7a7f..c0f3af1c8ed9e410e81bce1f9179f2ecde1f3cee 100644 (file)
--- a/csv_util.cc
+++ b/csv_util.cc
@@ -146,13 +146,7 @@ typedef enum {
   XT_YYYYMMDD_TIME
 } xcsv_token;
 
-// Static definition of in_word_set to meet C99 rules as used by Clang.
-static struct xt_mapping*
-in_word_set(register const char* str, register unsigned int len);
-
-#define register
 #include "xcsv_tokens.gperf"
-#undef register
 
 #if CSVFMTS_ENABLED
 /****************************************************************************/
@@ -789,7 +783,7 @@ void
 xcsv_ifield_add(char* key, char* val, char* pfc)
 {
   field_map_t* fmp = (field_map_t*) xcalloc(sizeof(*fmp), 1);
-  struct xt_mapping* xm = in_word_set(key, strlen(key));
+  struct xt_mapping* xm = Perfect_Hash::in_word_set(key, strlen(key));
 
   fmp->key = key;
   fmp->hashed_key = xm ? xm->xt_token : -1;
@@ -809,7 +803,7 @@ void
 xcsv_ofield_add(char* key, char* val, char* pfc, int options)
 {
   field_map_t* fmp = (field_map_t*) xcalloc(sizeof(*fmp), 1);
-  struct xt_mapping* xm = in_word_set(key, strlen(key));
+  struct xt_mapping* xm = Perfect_Hash::in_word_set(key, strlen(key));
 
   fmp->key = key;
   fmp->hashed_key = xm ? xm->xt_token : -1;

diff --git a/xcsv_tokens.gperf b/xcsv_tokens.gperf
index c57b0edb12dfcd2bb60954d18605a0fb217dfdeb..b2fabcbf7e563ea411b59fd31028d4bfdf081a3c 100644 (file)
--- a/xcsv_tokens.gperf
+++ b/xcsv_tokens.gperf
@@ -1,5 +1,5 @@
-/* ANSI-C code produced by gperf version 3.0.4 */
-/* Command-line: gperf --output-file=xcsv_tokens.gperf -L ANSI-C -D -t xcsv_tokens.in  */
+/* C++ code produced by gperf version 3.1 */
+/* Command-line: gperf --output-file=xcsv_tokens.gperf -L C++ -D -t xcsv_tokens.in  */
 /* Computed positions: -k'2,4-5,12,$' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -26,7 +26,7 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
 #line 1 "xcsv_tokens.in"
@@ -39,15 +39,16 @@ struct xt_mapping {const char *name; int xt_token; };
 #define MAX_HASH_VALUE 248
 /* maximum key range = 242, duplicates = 0 */
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (register const char *str, register unsigned int len)
+class Perfect_Hash
+{
+private:
+  static inline unsigned int hash (const char *str, size_t len);
+public:
+  static struct xt_mapping *in_word_set (const char *str, size_t len);
+};
+
+inline unsigned int
+Perfect_Hash::hash (const char *str, size_t len)
 {
   static unsigned char asso_values[] =
     {
@@ -78,12 +79,12 @@ hash (register const char *str, register unsigned int len)
       249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
       249, 249, 249, 249, 249, 249
     };
-  register int hval = len;
+  unsigned int hval = len;
 
   switch (hval)
     {
       default:
-        hval += asso_values[(unsigned char)str[11]];
+        hval += asso_values[static_cast<unsigned char>(str[11])];
       /*FALLTHROUGH*/
       case 11:
       case 10:
@@ -92,27 +93,21 @@ hash (register const char *str, register unsigned int len)
       case 7:
       case 6:
       case 5:
-        hval += asso_values[(unsigned char)str[4]];
+        hval += asso_values[static_cast<unsigned char>(str[4])];
       /*FALLTHROUGH*/
       case 4:
-        hval += asso_values[(unsigned char)str[3]];
+        hval += asso_values[static_cast<unsigned char>(str[3])];
       /*FALLTHROUGH*/
       case 3:
       case 2:
-        hval += asso_values[(unsigned char)str[1]];
+        hval += asso_values[static_cast<unsigned char>(str[1])];
         break;
     }
-  return hval + asso_values[(unsigned char)str[len - 1]];
+  return hval + asso_values[static_cast<unsigned char>(str[len - 1])];
 }
 
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 struct xt_mapping *
-in_word_set (register const char *str, register unsigned int len)
+Perfect_Hash::in_word_set (const char *str, size_t len)
 {
   static struct xt_mapping wordlist[] =
     {
@@ -314,15 +309,15 @@ in_word_set (register const char *str, register unsigned int len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash (str, len);
+      unsigned int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
-          register int index = lookup[key];
+          int index = lookup[key];
 
           if (index >= 0)
             {
-              register const char *s = wordlist[index].name;
+              const char *s = wordlist[index].name;
 
               if (*str == *s && !strcmp (str + 1, s + 1))
                 return &wordlist[index];